Snap for 13270875 from b45a61bc3fde8f1fcd00bda1f12335fe65373990 to sdk-release Change-Id: I0f17b33221700dca2ccb5557632a50bda2b53b44